Merge from trunk.

diff --cc src/ChangeLog
index dc81626038d01afb37e67abf42d2caf73528000b,3fc8067e114ea2c3bca4eadd53c4b3c1e64e191e..6b75029dd5cfac1ad2e8bf9355532fe939ae3da0
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,7 -1,8 +1,12 @@@
 +2011-07-25  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      * Makefile.in (gl-stamp): move-if-change is now in build-aux.
 +
+ 2011-07-25  Paul Eggert  <eggert@cs.ucla.edu>
+ 
+       * bidi.c (bidi_dump_cached_states): Fix printf format mismatch.
+       Found by GCC static checking and --with-wide-int on a 32-bit host.
+ 
  2011-07-25  Eli Zaretskii  <eliz@gnu.org>
  
        * xdisp.c (compute_display_string_pos): Fix logic of caching